… of the develop branch.

Ruggedizing the code for different inputs types and maintaining backwards compatibility.

Repairing the output_values_distribution functionality

…sion of the develop branch.

Ruggedizing the code for different inputs types and maintaining backwards compatibility.

Adding a testing functionality

…sion of the develop branch.

Ruggedizing the code for different inputs types and maintaining backwards compatibility.

- fixing some errors in spelling and functionality of votage droop

…sion of the develop branch.

Ruggedizing the code for different inputs types and maintaining backwards compatibility.

- fixing v_droop_ctrl and reordering pf import test

…ller

…ller

…sion of the develop branch.

Ruggedizing the code for different inputs types and maintaining backwards compatibility.

- removing deprecated attribute overwrite_convergence

# Conflicts:
#	pandapower/control/controller/station_control.py
#	pandapower/converter/powerfactory/pp_import_functions.py
#	pandapower/test/control/test_stactrl.py

…sion of the develop branch.

- merged develop
- ruggedized code for 1 output element

…sion of the develop branch.

- assured droop controller convergence, problems with v_droop

…ller

…it exists)

improving assertion logic

# Conflicts:
#	pandapower/control/controller/station_control.py
#	pandapower/test/control/test_stactrl.py

…it exists)

improving assertion logic for error info after failed convergence

…ller

…roller' into pushable_changes_of_station_controller

…ller

# Conflicts:
#	pandapower/control/controller/station_control.py
#	pandapower/converter/powerfactory/pp_import_functions.py
#	pandapower/test/control/test_stactrl.py

…ally for better readability

- first implementation

…ally for better readability

- changing testing environment to work with new methodology

…ally for better readability

- changing testing environment to work with new methodology

…ally for better readability

- changing testing environment to work with new methodology

…ally for better readability

- changing testing environment to work with new methodology

…ally for better readability

- Substituting voltage_ctrl for control_modus in droop_controller
- Assuring legacy support
- Adapting testing functionality

…ller

…roller' into pushable_changes_of_station_controller

# Conflicts:
#	CHANGELOG.rst
#	pandapower/test/control/test_stactrl.py

…ller

…roller' into pushable_changes_of_station_controller

# Conflicts:
#	pandapower/test/control/test_stactrl.py

- Adding test for all current controller type
- adding test for importing from json

- adding test for all current controller
- Adding test for importing from json after enum

…roller' into pushable_changes_of_station_controller

# Conflicts:
#	pandapower/file_io.py

- adding tests
- preliminary bugfixes

- adding json for distribution test

…ons in new branch

…ons in new branch